From b7a980d5d8469a932e9a63460768a46b2fe0a3f3 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Thu, 3 Dec 2015 11:38:50 +0100 Subject: [PATCH] Adwaita: added back style for scales on selected list rows --- gtk/theme/Adwaita/_common.scss | 15 ++++++++++++++- gtk/theme/Adwaita/gtk-contained-dark.css | 8 ++++++++ gtk/theme/Adwaita/gtk-contained.css | 8 ++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 4cfc9187d0..85d9c95d60 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -2175,6 +2175,9 @@ scale { &:insensitive { @include button(backdrop-insensitive); } } + // ...on selected list rows + row:selected & { &, &:insensitive { border-color: $selected_borders_color; } } + // OSD .osd & { @include button(osd); @@ -2215,6 +2218,13 @@ scale { &:insensitive { background-color: $insensitive_bg_color; } } + // ...on selected list rows + row:selected & { + box-shadow: none; + + &, &:insensitive { border-color: $selected_borders_color; } + } + // OSD .osd & { border-color: $osd_borders_color; @@ -2245,6 +2255,9 @@ scale { } } + // ...on selected list rows + row:selected & { &, &:insensitive { border-color: $selected_borders_color; } } + // OSD .osd & { border-color: $osd_borders_color; @@ -2257,7 +2270,7 @@ scale { *****************/ progressbar { - // FIXME: insensitive state missing + // FIXME: insensitive state missing and some other state should be set probably padding: 0; font-size: smaller; color: transparentize($fg_color, 0.6); diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index a23179fa4a..a16011029e 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -2975,6 +2975,8 @@ scale { box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); } scale slider:backdrop:insensitive > .label { color: inherit; } + row:selected scale slider, row:selected scale slider:insensitive { + border-color: #0f2b48; } .osd scale slider { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); @@ -3035,6 +3037,10 @@ scale trough, progressbar trough { box-shadow: none; } scale trough:backdrop:insensitive, progressbar trough:backdrop:insensitive, progressbar:backdrop trough:insensitive { background-color: #333636; } + row:selected scale trough, scale row:selected trough, row:selected progressbar trough, progressbar row:selected trough { + box-shadow: none; } + row:selected scale trough, scale row:selected trough, row:selected progressbar trough, progressbar row:selected trough, row:selected scale trough:insensitive, scale row:selected trough:insensitive, row:selected progressbar trough:insensitive, progressbar row:selected trough:insensitive { + border-color: #0f2b48; } .osd scale trough, scale .osd trough, .osd progressbar trough, progressbar .osd trough { border-color: rgba(0, 0, 0, 0.7); background-color: rgba(0, 0, 0, 0.5); @@ -3055,6 +3061,8 @@ scale highlight, progressbar progress { scale highlight:backdrop:insensitive, progressbar progress:backdrop:insensitive, progressbar:backdrop progress:insensitive { background-color: transparent; border-color: transparent; } + row:selected scale highlight, scale row:selected highlight, row:selected progressbar progress, progressbar row:selected progress, row:selected scale highlight:insensitive, scale row:selected highlight:insensitive, row:selected progressbar progress:insensitive, progressbar row:selected progress:insensitive { + border-color: #0f2b48; } .osd scale highlight, scale .osd highlight, .osd progressbar progress, progressbar .osd progress { border-color: rgba(0, 0, 0, 0.7); } .osd scale highlight:insensitive, scale .osd highlight:insensitive, .osd progressbar progress:insensitive, progressbar .osd progress:insensitive { diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 66f0d6971a..6f17d1d88c 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -3137,6 +3137,8 @@ scale { box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); } scale slider:backdrop:insensitive > .label { color: inherit; } + row:selected scale slider, row:selected scale slider:insensitive { + border-color: #184472; } .osd scale slider { color: #eeeeec; border-color: rgba(0, 0, 0, 0.7); @@ -3197,6 +3199,10 @@ scale trough, progressbar trough { box-shadow: none; } scale trough:backdrop:insensitive, progressbar trough:backdrop:insensitive, progressbar:backdrop trough:insensitive { background-color: #f4f4f4; } + row:selected scale trough, scale row:selected trough, row:selected progressbar trough, progressbar row:selected trough { + box-shadow: none; } + row:selected scale trough, scale row:selected trough, row:selected progressbar trough, progressbar row:selected trough, row:selected scale trough:insensitive, scale row:selected trough:insensitive, row:selected progressbar trough:insensitive, progressbar row:selected trough:insensitive { + border-color: #184472; } .osd scale trough, scale .osd trough, .osd progressbar trough, progressbar .osd trough { border-color: rgba(0, 0, 0, 0.7); background-color: rgba(0, 0, 0, 0.5); @@ -3217,6 +3223,8 @@ scale highlight, progressbar progress { scale highlight:backdrop:insensitive, progressbar progress:backdrop:insensitive, progressbar:backdrop progress:insensitive { background-color: transparent; border-color: transparent; } + row:selected scale highlight, scale row:selected highlight, row:selected progressbar progress, progressbar row:selected progress, row:selected scale highlight:insensitive, scale row:selected highlight:insensitive, row:selected progressbar progress:insensitive, progressbar row:selected progress:insensitive { + border-color: #184472; } .osd scale highlight, scale .osd highlight, .osd progressbar progress, progressbar .osd progress { border-color: rgba(0, 0, 0, 0.7); } .osd scale highlight:insensitive, scale .osd highlight:insensitive, .osd progressbar progress:insensitive, progressbar .osd progress:insensitive { -- 2.30.2